Solution for issue 1
Solution for fix2
Merge branches 'issue1' and 'issue2' into dev_1.0