Fix issues
Merge commit '435ce48a57df6f63ad8bb04bb2d1b02fde8f987d'