CU-86dtrwjb0 - NEON2 - Investigate issue with using MAX button

[LeonardoDizConde]

What current issue(s) from Trello/Github does this address?

What problem does this PR solve?

How did you solve this problem?

How did you make sure your solution works?

Are there any special changes in the code that we should be aware of?

Is there anything else we should know?

• [ ] Unit tests written?

[melanke]

Task linked: CU-86dtrwjb0 NEON2 - Investigate issue with using MAX button